Start adding tests back