Reorganized and added simple test module