Ticket 48251 - Improve the basic test suite
    
    Description: Refactor basic suite code, because it should
                 correspond pytest and PEP 8 standarts.
    
                 Added a minor fix(that addresses false failures)
                 written by Mark Reynolds
    
    https://fedorahosted.org/389/ticket/48251
    
    Signed-off-by: Mark Reynolds <mreynolds@redhat.com>
    (cherry picked from commit ee96ec73de037ae666edaeef584f8b8e48527ab5)