Minor reformatting
Added a few more tests