Improved tests 2

Improved tests as outlined