Overhauled tests