Thirteenth

Almost finished unit tests