Added proper tests