Made testing a bit more general