Added more unit tests, redundant tests had been removed.