refactor, rm unneeded tests