unit tests + project changes