Switch plans like a boss. And remove pesky pending tests :(