Updated with all of the current tests and extras