Adding Spring machinery and first tests