Add mockita and update Spring framework to 4.1.3