rebuilded solution for test