Adding Get/Set and some tests.