deleted unnecessary comments in Test.java
correct merge with qctest
merged sol
mannual merged with Juan's branch