removed unneeded files from unit test dir.
made singleton accessor and added tests