Tweaked some things, removed tests