Q4 and 5 modified

Added tests for Q4 and Q5