Improvement to decrease moment size (by almost half) 
- Unit test improvements