Unit Testers Added / Cleaned up code