Style and test changes