[UPDATE] Starting with adding unit tests