updated tests to new structure