Added more unit tests. Failed at this moment.