Added final unit tests