fixes in command import
tests + test infrastructure