Fixes to tests. Created and finished Test Suite.