Minor correction and first unit testing