All tests passing: woo!