added code to computation test
fixed merge on __init__.py