Adding tests. Working on string formatting.