aditional tests, code review fixes