Enhanced the whole solution, running last tests