Passed a few trivial tests and added first non-trivial