Fixing last set of tests