added basic tests and applied code conventions