Added base Unit Tests and fixed for the future