#102 Added some tests. Still some missing