added more complete tests