Changed Tests, implemented PS1.1c&d.
Formatting and Cleanup.