cloudbase filter conversion
minor refactors and edits
remove duplicate test