Rev 2

Added tests and class methods