A lot of new small changes for testing