Spring tests improvements