Test more

Added more test cased for better coverage. Ready to be merged