Added few class files and tests