Fises class
add tests
Add tests
fixes