Implementing Instance and refatoring tests