Adding tests. Need more