Bugfix for test app