FIX: test suite issues