Completed description and added some more tests