Changed Property, added some tests.