Fix goofs, finish off tests for goofs. Fixes #4