reworking and getting tests running.