-- cleaning up tests
-- reorganising TODO list