more tests, and application working better