Fix goofs, finish off tests for goofs