Reorg and change tests to jasmine