Working on test suite again