Added full argument definitions - in tests state