Removed some duplicate tests (mostly default parameters being entered explicitliy)