getting tests cleaned up and working