Finish up current tests