Merged some duplicates in spec.
Fixed broken int test on windows