Working on getting tests running