test impoved
better tests