Work in progress.
Updated the passing test cases.