Finished some more tests