Adapted junit tests