More work - unit tests added