Merge "Update tests for new build target"