Tweak how we access the bukkit server instance to avoid crazy mockito magic for statics. Also make the test work