Submitting test work

I believe this handles all the different conditions expected.