Fixed some tracnghiem views and added more tests
Merge remote-tracking branch 'origin/Working' into Working