fixed tests
fixes and cs fixes