Fixed integration and web tests

Also properly separated servlet and core spring config