Tests (improved)

by Zulal Ahmad