Removed reduntant tests and TODO notations