Fix representation and str() forms; Add tests