Adding tests - failing ones so far