Code/tests fixed so all currently pass.