Upgraded version. Included spring test