#48: added code for preprocessing; added test cases; moved PreProcessTest into proper test directory