Added more Tests.