Removed unused test
Move tests into a separate part of code

- In order to make my unit test less entagled with implementation they
  have been moved into separate file where they will not overlap
- Changed Makefile to reflect that change
Add map to differentiate parts