Step 6
Step 7
Added unittest skeleton