finish getting tests passing