update composer.json
reorganize tests
part of reorganizing the tests
ignore composer.lock