added better tests