#63 Implemented Unit Tests
#63 Implemented Unit Tests