Improvements to tests
Updated testing