Fixes tests, errors in testing