Implemented last two unit test TODO notes