Circleci test

pulled from master, same as last cancled PR