Working on converting current tests to refection; about halfway done