Removed old code and fixed minor todo
Removing todos
Merge branch 'development' of ssh://github.com/weeeeeew/GDCN into development
Made testing methods package private and hence moved test class to respective package