Add tests
Comment out unused method - Will be deleted soon
Add command to makefile