Makes tests cleaner, fixes internalization