Better observer implematetion
Removed test class