migrate to Spring
fixing tests