Added several tests + little refactoring
Updated composer.json and readme files