Fixed issue #1,#2 and renamed test module.