removed seemingly unnecessary tests and clones, does not affect unit tests either way