Options Handler tests
Move stuff around, adjust namespaces.