Some fixes and changes
Disabling gh-pages push
Adding tests + general clean up