Removed TODO comment
Added prepare comment
Fixed typo
Updated test