fixes #1 and capsulates tests better