Linting and adding some tests

Adding tests