Moved a lot of testing stuff to ez-testing library