Adding tests for current functionality