Split tests into seperate files, added Tab view and model