remove hack
tests
super test