Added more Tests