added enums, removed all #Imports from tests, updated readme to reflect enums addition