fixed couple of issues in testing