Cleanup
Update makefile
update test requirements
Code cleanup