All nosetests passed. Some refactoring still needed in e.g. form printing