Initial arguments tests + A little bit of refactoring