Move to new location. Add test module