Simplified iotas; exported some names, added new test