Refs #16. Maybe better tests