refined tests, moved controller and model to rest module, merged trainer and club module