fixed style: remove parseInt with + & other anti-patterns
added more tests