More test skeletons
Implemented some tests