Add some more tests, make some corrections to unit tests