Fixing so tests work