Cleaned up applications and provided more neater Unit test cases