Implement some changes to make testing of app easier