And more testing

Please review, @erinnichols