Fixed review comments and tests