Changed layout and added basic tests