Rename classes to exclude "LXC", add tests