Relocated common test functions into utility
Fixing up dependencies
Added missing utilites