littel refactor, remve odd tests