Tried to add some tests