Adding more detailed tests