More alpha hackery. This is starting to get embarrassing, really need to fix those tests.