Unit tests for normalization methods
Normalize per sample as well, plus made normalization into methods
Merged upstream changes