Improve and test cases

Some improvements on last added classes