Added tests and skeleton functions