Started getting some good tests