Fixed Unit tests and beginnings of moving arguments to traits for reuseability in commands