added type and changed tests