Move two Builder-related tests into the test/Builder/ subdirectory.