Move tests over to testng and add more tests!