Bugs fixed
Created test module