Added test_noise.py to unit tests
Resolved merge conclicts.