Refactored tests to have one file per primitive
Improved tests