removed redundant tests, improved test names