Still working towards the master branch
Added some test utilities