Added even more unit tests