Started making first unit tests and first two bugs are fixed :)