Cleaned up isotest a bit