more tests, removed some deprecated code