Removed useless operator declarations
Added test code for self hosting