added test back to package, still need to add a few tests probably, some removed due to errors