Clean up tests, add case for unavailable feature