Fixed few bugs - now able to pass first test