Fixes tests
updates tests