Switch to using spec-style tests