Fixes bugs, completes method tests