refactor tests to not interfere with istanbul
re-style it