adding test framework, removing unused tests