Code tweaks / updated test app