Addin' more tests Cap'n