Finished the majority of the system tests