Cleaned up simulation test bench