Updating tests and adding rounded corners.

TODO: Finish rounded corners