Improved lots of test specs