Expand tests, Cleanup code.