Issue ITTE-692

Reorganized the tests and removed some repeating code.