More tests and fixing Offset