Removed a few lines, shorter and cleaner tests.