Fixed some descriptions and cleaned tests