Finally... seems to be working
Cleaned up tests