WIP: added changes of test/refactoring sessions,
#27 implemented 1-5 and 7 tasks