Fixes tests - they were very specific