integrate swapper; update table name
tests