tests working after merge