[WIP] Basic unit and functional tests work