[feature] - more unit tests, error correction