Add additional app tests and use contexts for readability