started to add tests
separating to modules