Adding immutability tests
Fixing build