lint and beautify
fix test file
add tests