Cleaned up the test suite.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>