test data corrected
bugs fixed
test added + data fix
test fix