Tests refactored
tests adjusted
inored files