Change some static values to dynamic and add minimal test config

Also fixed some typos and add teardown after test

Change-Id: If279d8c59d32a6eef0e6dded726ead99d4c644e6