Added some minor funcationality
Fixed some bugs in activation
Fixed some bugs in activation
Removed sql generator tests