Adding more tests and extra constructors.