Removed old and deprecated code from tests
Put test data in common class