Feature/tests 0.2.1