Fixed various issues
Added browser test