Change Element class. Add test