Removed incorrect __init__ for unit test which was causing crash while
running unit tests. So folder reorganisation.