finished claims refactor; updated tests