la la la
fix some more stuff
fixing unit tests
fix tests