Add custom asserts
Rename module