Adding and refining tests