added test and so fixes