Card 605 add unit tests