fixes and new module/class for testing purpose