Add Spring context + Tests