wip
Adding more tests
Adding more of sergios tests