Refactored all the tests
Merged in fixes for 3.0