Updated some tests and got rid of some unused extensions