SWC-347: added and refactored tests