initial test added and little bugs fixed