added Fibonacci, refactor with helper roles, small tests, bug fixing