Edited explore/connect, makefile, some issues with tests
removed some files