Some tweaks
Add test app