cleaner & more detailed tests