Upgraded entity cmd, added test package base

Unit testing coming whenever we need it!!!