moving some tests to the right scope of class