Added Clean Sweep tests

Added several unit tests covering previous stories