removed unneeded tests, added some new ones