A few test. Some dead code deletions and update to test util