Reorganize specs and added more specs