Completed code

This commit contains the completed test code