fixed clear, added main test
fixed clear, added main test
refactor to fix bad object structure, changed timeout to include animation ability fixes #2, fixes #1