improve tests, can't believe how I was working before this