fixed tests and class