fix/clean some obvious tests