Tests, still need to refactor to be true "unit" tests