First commit with implemented tests