Moved tests to test module;
Finished chapter 2