#483 [Anuj/Rishi] Fixing the specs. marked two specs wip