change to string
refactor tests
refactor test setup