Added controllers (without actions yet) and a couple tests