Fix tests and add composer.lock to repo