Fixing tests, CS issues, added the possibility to use query params