reorganize for testing for aspnet5/mvc6