refactored tests to use test-framework; cleaned-up the old tests