Fixing ApplicationContext tests