updated registration code; started unskipping skipped tests
merging