Minor tweaks and fixes for a sample test project