Added some initial tests (not sure if working)