More tests, edits + fix in code