Improve spring package scanning, fix test failures