Fixing tests, @Run annotation wasn't a good idea for this one.