Modified tests
Changed tests to use a static method instead of the constructor