Update smoketest to include some newly implemented features