Fixes

Tests now passing.