Added some other tests, removed others, modified some