Added some tests, ReqCalculator added some stuff