Tests divided, makefile changed
merge conflicts