Removed numpy dependencies, Added unittest, Minor Updates