Tests and  style

Unit test stubs added, method style changed