First tests added
Test suite very incomplete.
Changed some bits of code