Bugs fixed, test added