GH #229 - Adding tests + return proper defaults.