Sites

Added tests and fixed prior issues