Supports multiple commands, some tests added