[issue #167][Finished][Adding tests]