Made many changes to tests and registration...hope nothing's broken...