Switched several methods to properties. Added some basic tests.