Minor cleanup
Add testapp