Fixed single quotes issues, added tests, removed unused using and code cleanup