Changed some tests, removed color stuff from tree since it is irrelevant