Updated unexpected to 5.0.0beta23, cleaned up test code a bit.