Revise tests, add a few, and make sure everything works as expected