chore: Cleanup tests, add  tests