Adding basic tests
Style changes