checkin. Making it testable.
Added test file.