Fixes test structure, adds tests
Adds some test cases