readded tests just to be safe