consolidated tests, solved TODOs