Theme class tests and small api updates