Removed unused function
More tests