Organized and added tests