Adding some files just copied from spring-test (I missed to add in the
the previous commit)