Reorganize tests with a 'testapp'
Minor coverage improving