Removed old test code
Added Observable to the base build