added cleaner tests
removed duplicate tests