Implementing tests for the new version