slight modifications to test app
the great refactoring