Removed excess unit tests