#281 fixing testing issues