Simplify second success checking and add a test for it

Closes #5