unittest completely fixed