Fixes to for app only unit testing