More tests to BaseApp
Revert "More tests to BaseApp"

This reverts commit f3ab65e3771183373a6417a54ecf2161300413cc.
Revert "Revert "More tests to BaseApp""

This reverts commit 19bcd5d9b1ea3ca77cca6e9c654621867779ca16.