added unit tests for activity support