Added tests and previous chapter too