Fixed typo and so on
Tests - in progress