Adding more tests

• adding more tests
• fixing more bugs
gofmt