Simplified tests and fixed broken OptArgs code.