Added solution for the tests