Fix CollectFreeColors (again)
Add some test cases to CollectFreeColorsTest and add a common base class for CollectFreeColorsTest and CollectBoundColorsTest
Change order of parameters of assertEquals in tests