Readability and minor test changes