Moved files from core
Added acceptance tests