Organised colours, added SearchController tests