Added complete tests